From 2125cb8dcbdc68be82ed7d083e4107c8cac39cd7 Mon Sep 17 00:00:00 2001 From: oliskoli Date: Mon, 19 Dec 2005 19:27:33 +0000 Subject: [PATCH] Platform depended code removed. --- gpsbabel/bcr.c | 14 ++++---------- gpsbabel/ignrando.c | 4 ++-- gpsbabel/nmn4.c | 12 +++--------- gpsbabel/stmwpp.c | 12 +++--------- 4 files changed, 12 insertions(+), 30 deletions(-) diff --git a/gpsbabel/bcr.c b/gpsbabel/bcr.c index 5dd58435d..37ce53366 100644 --- a/gpsbabel/bcr.c +++ b/gpsbabel/bcr.c @@ -40,12 +40,6 @@ #define R_EARTH 6371000 /* radius of our big blue ball */ -#if defined (__WIN32__) || defined (__CYGWIN__) -#define CRLF "\n" -#else -#define CRLF "\r\n" -#endif - /* 6371014 would be a better value when converting to f.e. to mapsoure, but this seems to be used by Map&Guide when exporting to XML. @@ -354,7 +348,7 @@ static void bcr_wr_init(const char *fname) { filename = xstrdup(fname); - fout = xfopen(fname, "w", MYNAME); + fout = xfopen(fname, "wb", MYNAME); bcr_init_radius(); } @@ -379,7 +373,7 @@ void bcr_write_line(FILE *fout, const char *key, int *index, const char *value) { if (value == NULL) /* this is mostly used in the world of windows */ { /* so we respectfully add a CR/LF on each line */ - fprintf(fout, "%s%s", key, CRLF); + fprintf(fout, "%s\r\n", key); } else { @@ -387,9 +381,9 @@ void bcr_write_line(FILE *fout, const char *key, int *index, const char *value) tmp = (value != NULL) ? xstrdup(value) : xstrdup(""); if (index != NULL) - fprintf(fout, "%s%d=%s%s", key, *index, tmp, CRLF); + fprintf(fout, "%s%d=%s\r\n", key, *index, tmp); else - fprintf(fout, "%s=%s%s", key, tmp, CRLF); + fprintf(fout, "%s=%s\r\n", key, tmp); xfree(tmp); } } diff --git a/gpsbabel/ignrando.c b/gpsbabel/ignrando.c index 4320be433..5e0dc2041 100644 --- a/gpsbabel/ignrando.c +++ b/gpsbabel/ignrando.c @@ -214,7 +214,7 @@ ignr_fprintf(FILE *f, const char *fmt, ...) char eol = temp[i - 1]; if (eol == '\n') i--; fwrite(temp, 1, i, f); - if (eol == '\n') fprintf(f, "\x0D\n"); + if (eol == '\n') fprintf(f, "\r\n"); } if (temp != buff) xfree(temp); @@ -226,7 +226,7 @@ ignr_fprintf(FILE *f, const char *fmt, ...) static void ignr_rw_init(const char *fname) { - fout = xfopen(fname, "w", MYNAME); + fout = xfopen(fname, "wb", MYNAME); } static void diff --git a/gpsbabel/nmn4.c b/gpsbabel/nmn4.c index f9251a796..bdd2c2a55 100644 --- a/gpsbabel/nmn4.c +++ b/gpsbabel/nmn4.c @@ -33,12 +33,6 @@ #include #include -#if defined (__WIN32__) || defined (__CYGWIN__) -#define CRLF "\n" -#else -#define CRLF "\r\n" -#endif - static FILE *fin; static FILE *fout; static char *fin_name, *fout_name; @@ -279,9 +273,9 @@ nmn4_write_waypt(const waypoint *wpt) implementing a simple data exchange. */ - fprintf(fout, "-|-|-|-|%s|%s|%s|%s|%s|-|-|%.5f|%.5f|-|-|%s", + fprintf(fout, "-|-|-|-|%s|%s|%s|%s|%s|-|-|%.5f|%.5f|-|-|\r\n", zipc, city, zipc, street, number, - wpt->longitude, wpt->latitude, CRLF); + wpt->longitude, wpt->latitude); } static void @@ -327,7 +321,7 @@ nmn4_read(void) static void nmn4_wr_init(const char *fname) { - fout = xfopen(fname, "w", MYNAME); + fout = xfopen(fname, "wb", MYNAME); fout_name = xstrdup(fname); } diff --git a/gpsbabel/stmwpp.c b/gpsbabel/stmwpp.c index ae2100299..e3a64e6c4 100644 --- a/gpsbabel/stmwpp.c +++ b/gpsbabel/stmwpp.c @@ -33,12 +33,6 @@ static waypoint *wpt; #define MYNAME "STMwpp" -#if defined (__WIN32__) || defined (__CYGWIN__) -#define CRLF "\n" -#else -#define CRLF "\r\n" -#endif - #define STM_NOTHING 0 #define STM_WAYPT 1 #define STM_TRKPT 2 @@ -185,7 +179,7 @@ stmwpp_data_read(void) static void stmwpp_rw_init(const char *fname) { - fout = xfopen(fname, "w", MYNAME); + fout = xfopen(fname, "wb", MYNAME); } static void @@ -254,7 +248,7 @@ stmwpp_waypt_cb(const waypoint *wpt) fprintf(fout, ".%03d", wpt->centiseconds * 10); break; } - fprintf(fout, ",%s", CRLF); + fprintf(fout, ",\r\n"); } static void @@ -266,7 +260,7 @@ stmwpp_data_write(void) else track_index = 1; - fprintf(fout, "Datum,WGS 84,WGS 84,0,0,0,0,0%s", CRLF); + fprintf(fout, "Datum,WGS 84,WGS 84,0,0,0,0,0\r\n"); switch(global_opts.objective) { -- 2.30.2